[SYCL][UR] Fix build with libc++ #19521
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Sarnie, Nick <[email protected]>
sarnex
commented
Jul 21, 2025
| OUTPUT_VARIABLE LIBCXX_PATH | ||
| OUTPUT_STRIP_TRAILING_WHITESPACE) | ||
| execute_process( | ||
| COMMAND ${CMAKE_CXX_COMPILER} --print-file-name=libc++abi.a |
There was a problem hiding this comment.
the change here is because --print-file-name doesn't work as required here so the lookup always fails, so just fall back to the underlyting compiler's errors.
sarnex
requested review from
AlexeySachkov,
aelovikov-intel,
bader and
maarquitos14
aelovikov-intel
approved these changes
Jul 21, 2025
bader
reviewed
Jul 22, 2025
Signed-off-by: Sarnie, Nick <[email protected]>
pbalcer
approved these changes
Jul 22, 2025
Signed-off-by: Sarnie, Nick <[email protected]>
bader
approved these changes
Jul 22, 2025
Signed-off-by: Sarnie, Nick <[email protected]>
sarnex
added a commit
that referenced
this pull request
Jul 28, 2025
) We need to apply the custom flags both to the libdevice BC file generation and the imf host compile, as these flags could contain paths to stdlibc++ or glibc which are used in both. I forgot to do this in my [change](#19521) adding this flag. --------- Signed-off-by: Sarnie, Nick <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We previously added support for building
libsyclindividually withlibc++. At that time,libsycldidn't link againstlibLLVMso they did not need to be using the same STL implementation.Now,
libsycldoes link againstlibLLVM, one example here.Remove all the code that was to support
libsyclin particular and just make it work with the normal option LLVM uses,LLVM_ENABLE_LIBCXX. Most of the code I added actually checksLLVM_LIBCXX_USED, because LLVM checks at configure time iflibc++actually works even when passedLLVM_ENABLE_LIBCXX, and if it fails, it falls back tolibstdc++, and most of the time we actually want to know if we are actually usinglibc++.I added a CMake option
SYCL_LIBDEVICE_CXX_FLAGSto set the flags for libdevice because it will be required if someone doesn't use the LLVM option and just does it throughCMAKE_CXX_FLAGS, as those aren't used for libdevice but it still uses the STL.The two changes in
unified-runtime/source/loader/layers/sanitizer/msan/msan_libdevice.hppandsycl/source/builtins/common_functions.cppfix compile errors withlibc++.I also plan to add a job to the nightly to lock this down.
#19347